merge with xen-unstable.hg

diff --cc tools/libxc/ia64/xc_ia64_hvm_build.c
index ce90475007b6a69e55465c8b85c0ee227788dfd6,b4001621929ddda7aa941fb9734deeace74a8004..2c34b44a1d9d43b440e6e87dc1a3a8d2de00840e
--- 1/tools/libxc/ia64/xc_ia64_hvm_build.c
--- 2/tools/libxc/ia64/xc_ia64_hvm_build.c
+++ b/tools/libxc/ia64/xc_ia64_hvm_build.c
@@@ -553,8 -553,9 +553,8 @@@ setup_guest(int xc_handle, uint32_t dom
  {
      unsigned long page_array[2];
      shared_iopage_t *sp;
 -    int i;
      unsigned long dom_memsize = (memsize << 20);
-     DECLARE_DOM0_OP;
+     DECLARE_DOMCTL;
  
      if ((image_size > 12 * MEM_M) || (image_size & (PAGE_SIZE - 1))) {
          PERROR("Guest firmware size is incorrect [%ld]?", image_size);

diff --cc tools/libxc/ia64/xc_ia64_linux_save.c
Simple merge

diff --cc xen/arch/ia64/xen/dom0_ops.c
Simple merge

diff --cc xen/arch/ia64/xen/domain.c
Simple merge

diff --cc xen/arch/ia64/xen/hypercall.c
index 203d0211c56ebba285eb41d38d2ca26c04a4c79e,b6586c91068d8406ed41373d735ea6cd05266a6d..4a9ac5b5ec1ed4f83d2fd82bb103deb4434d3422
--- 1/xen/arch/ia64/xen/hypercall.c
--- 2/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@@ -42,12 -42,12 +43,12 @@@ const hypercall_t ia64_hypercall_table[
        (hypercall_t)do_ni_hypercall,           /* do_set_gdt */
        (hypercall_t)do_ni_hypercall,           /* do_stack_switch */
        (hypercall_t)do_ni_hypercall,           /* do_set_callbacks */
 -      (hypercall_t)do_ni_hypercall,           /* do_fpu_taskswitch */         /*  5 */
 +      (hypercall_t)do_ni_hypercall,           /* do_fpu_taskswitch *//*  5 */
        (hypercall_t)do_sched_op_compat,
-       (hypercall_t)do_dom0_op,
+       (hypercall_t)do_ni_hypercall,
        (hypercall_t)do_ni_hypercall,           /* do_set_debugreg */
        (hypercall_t)do_ni_hypercall,           /* do_get_debugreg */
 -      (hypercall_t)do_ni_hypercall,           /* do_update_descriptor */      /* 10 */
 +      (hypercall_t)do_ni_hypercall,           /* do_update_descriptor * 10 */
        (hypercall_t)do_ni_hypercall,           /* do_ni_hypercall */
        (hypercall_t)do_memory_op,
        (hypercall_t)do_multicall,

diff --cc xen/include/asm-ia64/domain.h
Simple merge

diff --cc xen/include/public/arch-ia64.h
Simple merge